Merge branch 'dont-dist-gresource-srcs' into 'gtk-3-24'

author Emmanuele Bassi <ebassi@gmail.com>

Wed, 25 May 2022 13:22:23 +0000 (13:22 +0000)

committer Emmanuele Bassi <ebassi@gmail.com>

Wed, 25 May 2022 13:22:23 +0000 (13:22 +0000)
author Emmanuele Bassi <ebassi@gmail.com>
Wed, 25 May 2022 13:22:23 +0000 (13:22 +0000)
committer Emmanuele Bassi <ebassi@gmail.com>
Wed, 25 May 2022 13:22:23 +0000 (13:22 +0000)
diff --cc gdk/Makefile.am
Simple merge
diff --cc gtk/Makefile.am
Simple merge
diff --cc win32/generate-msvc.mak
Simple merge
diff --cc win32/vs10/gtk3-demo-application.vcxprojin
Simple merge
diff --cc win32/vs10/gtk3-demo.vcxprojin
Simple merge
diff --cc win32/vs10/gtk3-icon-browser.vcxprojin
Simple merge
author	Emmanuele Bassi <ebassi@gmail.com>
	Wed, 25 May 2022 13:22:23 +0000 (13:22 +0000)
committer	Emmanuele Bassi <ebassi@gmail.com>
	Wed, 25 May 2022 13:22:23 +0000 (13:22 +0000)
		1	2
gdk/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
gtk/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
win32/generate-msvc.mak	patch \|	diff1 \|	diff2 \|	blob \| history
win32/vs10/gtk3-demo-application.vcxprojin	patch \|	diff1 \|	diff2 \|	blob \| history
win32/vs10/gtk3-demo.vcxprojin	patch \|	diff1 \|	diff2 \|	blob \| history
win32/vs10/gtk3-icon-browser.vcxprojin	patch \|	diff1 \|	diff2 \|	blob \| history